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

Change-Id: Iec197b243600ad21d9e58b272961d3d9ba167f42