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

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