Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424  -s ours
am: 270ef883af  -s ours

Change-Id: I8b5f947a09796fdc59cc170b894ba48c844faef3