Merge "Fix invalidation of vector iterator while computing removed class fields."