Merge "Fix for UEB connectivity to SDC"