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

Change-Id: Ib3308c7d3ed17b1424439344cfcca29ad7ac57c1