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

Change-Id: Ib8a386915d42b3fcf40f84f0f96fee3f6bbf22ca