Merge "Use addClassResourceCleanup in BaseImageTest"