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

Change-Id: I40363a8dfa67eeb76bcef16a239a753582e94edd