am 6550e461: am 0568a230: am 9d8a230f: Revert "View measurement optimization"

* commit '6550e461e50626b88835576e7bf12f49bb322e73':
  Revert "View measurement optimization"