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

Change-Id: I7b51227046dd3af58d0b7008f4a3a49d72ad69d5