[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 89d0fcc59c -s ours
am: 8dad9187cd -s ours
Change-Id: I047a0ed3022560f4d79a6729baeef786d81c739c
This commit is contained in: