Merge "Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev am: b9a56a4a -s ours am: 246d02d6 -s ours" into oc-mr1-dev-plus-aosp