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

Change-Id: I596636ce8d71ce60bb73ef4c95d1df32c0b1d3a0