Merge "Clean up network class resources via addClassResourceCleanup"