Merge "Verify redefined classes"
am: 940fb1774b

Change-Id: I93665c2696d17f33d204739c4d375975a9250e4e