[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 79f43db513
-s ours
am: 30b871c550
-s ours
Change-Id: Ic0aaf1b5f4a486cc9717c853002a80f6814a3b0b
main
commit
aa125d95ea