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

Change-Id: Idada6f127bb57ad2b39be988346f5022c004170b