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

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