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

Change-Id: I51b7f30fb9f32d74eb4a5df4fa0b84da834510c1