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

Change-Id: Ia2cab3f3660aaab8ac887487556fbed8a1a3ddb1