am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1

* commit 'f4e41c35387728720780935564a491cf9bf1357e':
  Cleanup references when turning BT off.