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

Change-Id: Iecd585728b932bd7ca9248dac9d6e9add1d60591