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

Change-Id: Iaac6f747d425d3448770023b8aa07db6d95e9d19