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