Merge "Fix invalidation of vector iterator while computing removed class fields."
am: 84cfb6cbe1

Change-Id: Ie673bb117efdde760f40755f07c5b4be3c0e4386