Merge "Fix weird race condition in BT manager"
am: 53b8be09c4

Change-Id: I97093c0a6db50bc0160ac8d43d7fe10eb852c35b