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