Merge "Convert Nlinterceptor HAL to Vendor Apex (CF)" into main