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

Change-Id: I0e17f1c8c46c3969e919a3be704c992c2912f7d5