Merge "Use CustomSliceRegistry directly when possible."