Merge "Ensure that soft-verification doesn't fail class redefinition."
am: 8c5e25b1a0

Change-Id: I4d112a1e53ae83ad4f727143add3e4fc9ebd8b4d