Merge "Allow different namespace types for different classloaders"