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

Change-Id: Ib675b2f620cb2a3f57aa1ad3f1cbe891d24102e4