Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb