Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 04a65d2e70  -s ours
am: e9d8b2b5f4  -s ours

Change-Id: I2c9abf1eaaf87f549b9a89e15720b0c1d3a3bc6f