Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7eca0300b9  -s ours

Change-Id: I28041089f69930af33b4ab93d031a2c2efceb0ab