am 50679473: Merge "Only watch location for BREAKPOINT event" into lmp-mr1-dev

* commit '506794738de41db046a8094e04aa2a7c5a6e02db':
  Only watch location for BREAKPOINT event