Squashed BT commits from CM

Change-Id: I7ca941bb27d4038a0485e49d104a98546e571f5a