[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 303f23382f -s ours am: 2e705fb60a -s ours

am skip reason: subject contains skip directive

Change-Id: If472129f59304a43ce9bfaff22ed7b58b7a84713