[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 85288a5e3c -s ours
am skip reason: subject contains skip directive

Change-Id: Iec829f315ae6c99cf4ab5b9f1f6e68b5d8f39a3f