am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev

* commit '19c0a1632f3be67c8cbbee210cd6d8eedfe3649a':
  View measurement optimization