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

Change-Id: Ice2e9ac2d69dbf1b4e1a115146de2bcc08cfbd97