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

Change-Id: I5a453dd7e4e36f992cf55e8b633cf766280b0fae