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

am skip reason: subject contains skip directive

Change-Id: I226a9e48932ce2e7021ad10783645b421df93e88