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

Change-Id: I8bea5934dda3f270ba76b37ebd8903c3a5fc1612