Merge "Validate NetworkDeviceInfo is not null in HotspotNetwork" into udc-dev