Merge "Ensure device_owners2.xml is always written." into udc-dev