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