Merge "reduce result fluctuation for memory and cpu tests" into jb-mr2-dev