Merge "Using WifiCommand to toggle the Wi-Fi state" am: bec5dc830e am: e1ba791c28 am: ae63f23efa

Change-Id: I0ae684b52989d9d02d8d78a1afcef40c1469c9b4