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

Change-Id: Ib4c07c473d892138f9df7bdf898f234f9bc990f0