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

Change-Id: If759921737e07f1c720771786b1b062429a213a4