Merge change 9097

* changes:
  Wifi: Add support for enabling Wifi while in airplane mode.