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

Change-Id: I79d36e45f9102b1b30bb9b5acca87366de4b8e20