Merge "RESTRICT AUTOMERGE - [Bluetooth apex] Use new apex name"