Merge "Use addClassResourceCleanup in MeteringTestJSON"