Changes for BT from AOSP