Merge "/bin/wifi:  Make 'wifi show' work for Frenzy." into wifitv