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

Change-Id: Ib5af825b9b9fa96b7e91b0d3b6c8ed9161fbc404