Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: d5b9fec389  -s ours
am: 532f150227  -s ours

Change-Id: Id4ea5c6c982f8ab27551513b422fd6570513b6d8