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

Change-Id: I35fdc137ba9f079e4d632d2e62c5aacbb83e9ec4