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

Change-Id: I2d839b0eae979a4a5c655427f57575006b9f0694