Class redefinition sometimes needs to update verification am: db55a1121b
am: 1318eef824

Change-Id: I9c244f2459605f1b195b16ce6b79d27ac542f239