[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: a1be4c0829  -s ours

Change-Id: I70453eadb2cf9f4f4130fb68d5ce6f03cc018c3a