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

Change-Id: Ib192e1569074bcd19d38d8e67a8378f63ca99164