Merge "Small fix in DeviceOwner.java."