am b7d7d5f6: Merge change 5806 into donut

Merge commit 'b7d7d5f6380e1b7c2b1754be05b0113b91ce01c9'

* commit 'b7d7d5f6380e1b7c2b1754be05b0113b91ce01c9':
  Use additional functions to collect more memory information data points.