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

Change-Id: I48bfb57abde75e7ef3883a710c4c6a5974b210aa