[automerger skipped] Merge "TimeStats: fix a racing case" into pi-dev am: d6370812 -s ours
am: 0b36f3de -s ours
am skip reason: change_id I2eace6d8693cc647284de0f33e7b58a6bf79eaaf with SHA1 cb7dd008 is in history
Change-Id: I58d58ee4176df769e80415a904557c016bb5eba7