am 4471609d: Merge "Only watch location for BREAKPOINT event"

* commit '4471609d86b7e846b26bebe3373707a10c222e71':
  Only watch location for BREAKPOINT event