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

Change-Id: I0d62b00ecc35ee4678eddedee90017594394ae0c