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

Change-Id: I0f00ed9d07d325cf76e4c0abda30d99dedab2e1d