Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
am: 552d35cb4f

Change-Id: I04ea51eee6ad1030844a720132a3e67b007cb19f