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

Change-Id: I4d42acafbebd1ca11e50573d3b3458f5e931074e