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

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