Merge "Update AssetManager_Delegate following commit 1187590"