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

Change-Id: I1fe5f42babe19bd8d4b90d3bfff2877cf06a7fbe