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

Change-Id: If38ef61a43b054ab10cc9f58062c43ab19b36347