Merge "Fix warnings when BLE_INCLUDED is FALSE" into klp-modular-dev