Merge "Remove BT references from System Server."