Squashed BT commits from CM

Change-Id: Ia4d4d60476ccc199c262fd56efd5b67715a172ee