fix crash w/ turning off bluetooth

Change-Id: If354ae961d7c620f3d39a35d596a68b0908a60ed
Merge "fix crash w/ turning off bluetooth" into jellybean