Merge "Fix multicloud service registration in MSB"