[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: a921223fe2
-s ours
am skip reason: subject contains skip directive
Change-Id: I27620645836d7e3e26894cbbff72e92cd1e54d9d
main
commit
ecce81d600