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

Change-Id: I9afac55b6613e371c846f7064ddb11a4f4fee652