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

* commit 'f8c7d87a65f7a94201d7aa3c7ff3f474b83f43db':
  View measurement optimization