Merge "WifiConfiguration: Remove a bunch of unused fields" into pi-dev