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

Change-Id: I862ac0ee9e44ab52838a797892d5cfe28a576a15