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

* commit '0568a230b34f879215e65fbaa79dfa377085bb41':
  Revert "View measurement optimization"