Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741 -s ours am: 4d00a951 -s ours am: a6eed85c -s ours" into oc-mr1-dev-plus-aosp