[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 885d4eaf1f -s ours am: 8f089260ba -s ours

am skip reason: subject contains skip directive

Change-Id: I52e26a1f12749a878a860c2f714fda47092eb78f