[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a5caa2cb8 -s ours

am skip reason: subject contains skip directive

Change-Id: If5c2a05baf69af069b5d7410cd0bbe02144d0169