am 58795020: (-s ours) am dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '58795020ef98789f5c5b942417ad0f23b6771221':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi