am 27271f67: am a5fb1204: Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev

* commit '27271f673546faa973d7a24c594da626ebdbd337':
  Fix incorrect exception being thrown from WifiConfiguration