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

Change-Id: Ic4696096352546cb962ab57470ed569535791665