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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e7f3897b -s ours am: effc2bdd -s ours am: f241a624 -s ours am: 43f95a77 -s ours" into rvc-qpr-dev-plus-aosp am: 39a52d2d -s ours

am skip reason: subject contains skip directive

Change-Id: Ica33097b7450b009ee3bee3e2ec13ecaee4e8a83