Squashed BT commits from CM

Change-Id: I5d511fe35a08a1e2776a45e1eda0f8e3c804741b