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

Change-Id: I0984955c92cd1ea6051123b6d5f808c432a047bf