Merge "[automerger skipped] RESTRICT AUTOMERGE Replace all references to the new strings with a pre-existing string am: c5dca40d am: dc6a5db7 -s ours"