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

* commit 'a5fb1204385be2ab58bb4b653fbffae4f365b98c':
  Fix incorrect exception being thrown from WifiConfiguration