Merge "Remove mDeviceOwnerName - it's never read"