Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 1190614529  -s ours

Change-Id: Ide4638e5f3a11cc9457cf9ddbf61ecf748967491