Merge "Change the NetworkInfo for disconnected types." into lmp-dev