am d37638e5: am 11a3bc70: am 709a4278: Merge "Don\'t mark wifi disabled unless it\'s off." into klp-dev

* commit 'd37638e5262fea65bf428cb78e73a9b4e02a93fe':
  Don't mark wifi disabled unless it's off.