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

am skip reason: subject contains skip directive

Change-Id: Iae2173cc9798e74465f4c90a2e794d8e0d23ffe0