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

Change-Id: Ia2f22fd6a148cd47f37c5288940801853f2b9ee1