Merge "Improve performance of storage measurement." into jb-mr2-dev