Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev