Merge "fix compliation when BLE_VND_INCLUDED is false"