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

Change-Id: Ibd558eb8e97f84c8ad2065ca01b728d48273b1a8