Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135e -s ours am: e4a4b7db -s ours" into rvc-d1-dev-plus-aosp