Merge "Import translations. DO NOT MERGE" into oc-dev am: 69fe3e4678  -s ours
am: 429e38cacb  -s ours

Change-Id: I7eda9f6f71407ba93c05cdfcc5c07d879ad3e00d