am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot...
am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '5f683ca8':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi