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

* commit '97d102d9e207f3379ef94929e239de848c784754':
  Add simple null checks to StorageWizard*, also listen to...