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

Change-Id: Ieaf2d9f1a3ac8c4e420857c96ae818773c00a71b