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

Change-Id: I44858412e07bf9df60d782ae8c0349f7cdcde4b5