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

Change-Id: Ibc2f88f11d3ae8add29a60af099efc6818125662