Merge "Import translations. DO NOT MERGE am: 6cf2d99816
-s ours am: bd3bd7d1e1
-s ours am: 29978d1ee6
-s ours" into oc-mr1-dev-plus-aosp
am: 2929aa2069
-s ours
Change-Id: I21e677aa73df3a150f46bed015f61592c71be348
This commit is contained in: