Fix BT derp and other minor changes related to merge.

Change-Id: If8624916ef095c3a46d7b02dfef64d2c260d38f8