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

Change-Id: Iad888e5ac5537dc6f0f8ef7f6a083c45eb903014