Merge "bluetooth: disable BLE_VND_INCLUDED"