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

Change-Id: Ia432ecc1676f926a157eb6b978990c19814f2aa4