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

Change-Id: If0dd4c77047904e05c5da19c8ffb839f80fdcc31