Merge "Work on issue #70859548: Reduce amount of time spent collecting pss data"