Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 752457eaa7  -s ours
am: 54fa8b3f29  -s ours

Change-Id: I7bb0c656b48e8fa73794280bb5a0f4bb89fcb079