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

* commit '41343c0f287863488a10a429d88ec094e9183938':
  Revert "View measurement optimization"