Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 26f4e4dfca  -s ours
am: 31f2b4bfc7  -s ours

Change-Id: Id2f913578832fefde9a8a2912b1a9d0ca7a6f1ce