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

Change-Id: I93def4af05612133a9470d074cef1c5379563579