Merge "Remove NsdShim as it is not required" into main