Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 018d1e066e  -s ours" into oc-mr1-dev-plus-aosp