Merge "AssetManager2: Allow out of order type/type spec"