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

Change-Id: Ic9f8d02b13f39d57337acdfda9aeffb5275ad49d