am 2beb2ab1: am 80cd1635: Merge "Mark breakpoint roots"

* commit '2beb2ab1561339601dfc905e68122faa8b76263b':
  Mark breakpoint roots