Merge "Clean up identity base class resources via addClassResourceCleanup"