am 80cd1635: Merge "Mark breakpoint roots"

* commit '80cd163575f3ca7b8f9885e47fdcc798336ab058':
  Mark breakpoint roots