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