Merge "Bluetooth: Add CHECK and move ASSERT" am: b835ea3f11 am: 028ce01354
am: 4bbcb8f41e

Change-Id: Id503d07ba2adeef890882df2f686635abc7749d9