Merge "Allow device owner type to be set more than once"