Merge "Misc cleanup for class redefinition."
am: 33c6731220

Change-Id: Ibf7864f7d83e5d4ca7b836ca1090ce5aa3850a79