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

Change-Id: Ic59f51775abc8f531237e5832631ee1217a0dd8c