More changes to hosting device manager

Change-Id: I8599224a3e6c69d5039962dc732ae62a5b0e4f78