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

Change-Id: Ie7feb3a9754e5f2ed32eb1798b5c3cfc505d67f5