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

Change-Id: I3039400b3469a8a168f27e805ca4f70f31569985