Merge "dumpstate: Remove wpa_cli usage" into oc-dr1-dev