Merge "Add null check for Wi-Fi command" am: 43ee2ac140 am: 51e24de109 am: a6e588fffc am: c6e2c78ee6
am: 7abb8228b4

Change-Id: Ic816dc96325edf45940c1afc7c2f83bf14fd8f09