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

Change-Id: I8f92d3f9c8b15070a661cf0480268b7100ca33ec