Merge "Ensure that soft-verification doesn't fail class redefinition." am: 8c5e25b1 am: a4225d22 am: 2de5aaf9 Change-Id: I99989814f8c4a8044472d02dffc45587e0c1e7d7