AOSP BT FIX FOR STE