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