am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev

* commit '5c0f3e5075c8ac8b22bbaeb32bddfada9657577a':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially