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

Change-Id: Ied055f77c43f747a9ef66a9f4f217aaf1aa1ff76