Merge "Import translations. DO NOT MERGE" into pi-dev am: f8aa14ad01
-s ours
am: bfe125280a
-s ours
Change-Id: I069f9b754a07c0cfeddd4474edbf6e74e349d154
main
commit
d489ed6ba8