Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa095 -s ours am: e002abfb -s ours am: 10244a3c -s ours" into rvc-d1-dev-plus-aosp am: e5b64442 -s ours am: d0a105b3 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie5ee87dbed89c1dba3dbccce9b4427b3efdcf729