Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c784df5b41  -s ours
am: 54f598e100  -s ours

Change-Id: I70ba4fc219fa42950794c869d021ca60ad5720a3