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

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