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

Change-Id: I70acf423641b86f4c23de13608b5cb82b0527e5d