[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 01900e65fc
-s ours
am skip reason: subject contains skip directive
Change-Id: I01f062132b5b6b40de3f532a0b4c48da14ffa0c9
main
commit
151132139a