Merge "Simplify checks for get profile/device owner"