Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 499c2dd27d
-s ours
Change-Id: Id513723691cd77e19f983bf3294439b8760c16d6
main
commit
941e1401e2
am: 499c2dd27d
-s ours
Change-Id: Id513723691cd77e19f983bf3294439b8760c16d6
main