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