Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e5580385b1
-s ours
Change-Id: If0e4813d007f5b5d9a8817b899c9c112464c4b45
main
commit
77205e18f1
am: e5580385b1
-s ours
Change-Id: If0e4813d007f5b5d9a8817b899c9c112464c4b45
main