Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 0c9b770aaa  -s ours

Change-Id: Ife8d71d4e4ee5ef9f394b2f5a7428a353a916f2e