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

Change-Id: Id8d2f7214393e08c771cc8e49884b76b1501054e