Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev