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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c2f7f1a4 -s ours am: e7470afa -s ours am: 7ae55aab -s ours" into rvc-d1-dev-plus-aosp am: 3d134ba4 -s ours

am skip reason: subject contains skip directive

Change-Id: I2513fc65b19d772f2c55a52b79d457f19662c88d