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

Change-Id: I4f5887b8444b16dab976ba9cb9383f68bc2a9f59