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

Change-Id: I4b09b7af3edc8656378a2abec2c395c07bb61fae