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

Change-Id: If7c5be44c3912e481e85103c0b6bc9f11f08381a