Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev