am 75651de4: am 97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev

* commit '75651de4d17200d4aa0ae083303f8214c7b7478b':
  Add simple null checks to StorageWizard*, also listen to...