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

Change-Id: Ib92fdf7cd9095f34a1ee581c1ed923d0e34994c9