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

am skip reason: subject contains skip directive

Change-Id: I36d268372113cbde5c895a14e34a062b2697d0ea