Merge "Speculative fix for BT race condition"
am: 13a230ebff

Change-Id: Id7241854254cca5195cb225ef7eac47a70f88642