Merge "Dumpstate's netstat call should use -W." am: 0708c8355f am: ae4d6a6c8b
am: 7783703006

Change-Id: Ic37a4911434aa7bc2e1a9ed5dcf3fc1488c9776c