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

Change-Id: I18d7873ae8f9493eef4777ae36956ce012cf5692