Merge "Import translations. DO NOT MERGE am: aee9e596da
-s ours am: 91bda9c6a0
-s ours" into oc-mr1-dev-plus-aosp
commit
ba869f3a8c
aee9e596da
-s ours am: 91bda9c6a0
-s ours" into oc-mr1-dev-plus-aosp