Merge "Remove breakpoints from redefined classes" am: fb38266f9f
am: 0d361ca74e

Change-Id: Id02729e26e775353e71dfaa7b7272453b5df185f