Merge "SamplingTimer: Fix issue with summary recording too much" into nyc-mr1-dev