Merge "Add a name to the DeviceOwner" into klp-dev