Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d8330556b3  -s ours am: bb0c01e7ef  -s ours" into oc-mr1-dev-plus-aosp