Merge "Add API to set device owner type for a managed device" into sc-dev