Merge "SamplingTimer: Fix issue with summary recording too much" into nyc-mr1-dev am: 8aacc3cf98
am: 16b8cc1eda

Change-Id: Ia2f0cac350e04cbcc5440862d3779a024c1ba523