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

Change-Id: Ib77a48945fd9d889daa7461959749528f2633c3e