am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit '50234a19aa8d2a5b4b640bbe3cf4f6d735a8baee':
  Fix automatic Wi-fi toggle