Merge "NetworkManagementService: adjust the qtaguid idx to new kernel"