Changes for STE AOSP bluetooth