Merge "Clean up variables when closing BT"
am: 640792bac8

Change-Id: If7f00e6923b1bc0c5a03515c40850e19884da825