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

Change-Id: Ie457d1526565418f5f05b8a6c6107a439e8d9909