Merge "Import translations. DO NOT MERGE" into oc-dev
am: 21b5f4063e  -s ours

Change-Id: Ibe6ea76c93c5203c4d528731aeb8bf691deaea3b