Merge "Add null check for Wi-Fi command" am: 43ee2ac1 am: 51e24de1 am: a6e588ff am: c6e2c78e am: 7abb8228 Change-Id: Ic816dc96325edf45940c1afc7c2f83bf14fd8f09