Merge "View measurement optimization" into lmp-mr1-dev