Merge "Migrating frameworks/base BT files"