Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2d95320d7b  -s ours am: 8a40e3ec31  -s ours" into oc-mr1-dev-plus-aosp