Class redefinition sometimes needs to update verification
am: db55a1121b

Change-Id: Iedd06ed2695e8a5059631c21fbd7768e85f3d3a9