Squashed BT commits from CM

Change-Id: I31691338184b70bb992df5202319010a8da6133b