Merge "AssetManager2: Add other support methods"