Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
am: b9a56a4af7  -s ours

Change-Id: I29dae91c1eea2fbc1619fea180be942c9ef3bc35