Merge "Fix invalidation of vector iterator while computing removed class fields." am: 84cfb6cb am: 142f4a60 am: 07f26208 Change-Id: Ia2cab3f3660aaab8ac887487556fbed8a1a3ddb1