Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 702d5a75ba  -s ours
am: 60163db9b9  -s ours

Change-Id: I29a0b7d77f07aa462ab065b517e632319f36a5df