Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 0412be040b  -s ours
am: 31219d700a  -s ours

Change-Id: I75f1f61dc0b987d3e6a5e20fc39a620d5a1fe4d5