Merge "Remove AsyncChannel usage in NsdManager"