Merge "Return total footprint, not high water mark." into lmp-mr1-dev