wifitoggle: merge r35415