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

Change-Id: Ifb4cd4dfada3053e3a335d76668084e62de62485