[automerger skipped] Merge "TimeStats: fix a racing case" into pi-dev
am: d637081295 -s ours
am skip reason: change_id I2eace6d8693cc647284de0f33e7b58a6bf79eaaf with SHA1 cb7dd00887 is in history

Change-Id: I5a6b1d800564acc433be3a54bcfe5d109c65e75e