Merge "AssetManager2: Add GetResourceId"