Merge "AssetManager: Remove more methods, fix comments"