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

Change-Id: I4046d8802fbeae277932717571509c1e0d6537ca