Merge "Remove mDeviceOwnerName - it's never read" into tm-dev