Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: eb4138e7e4  -s ours
am: c8cb7b107f  -s ours

Change-Id: I1d07ec2f5b2fd96d27f76c76244dccbc541d39ef