Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev