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

Change-Id: I2b5f30a86e62d6f8158da6d359dc27615f719e3d