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

Change-Id: Id190d0e160b252fe5e020399f59cdae425f303c8