BT Tweaks

Change-Id: I2388d29528803c929ab4e39c993ee9de9547b5ed