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

Change-Id: I94d247f60e399547e4418859a014d2c48ac35674