Merge "Remove breakpoints from redefined classes"
am: fb38266f9f

Change-Id: I6f315e4154a8b0c35b95d1bb833b8251e5c11d6a