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

Change-Id: Ide8d99318f9de4030d66d574ae97f1346732eddf