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

Change-Id: I427a4ab63aca8bac7ff2c4a251052becf018b7d8