Merge "TimeStats: fix a racing case" into qt-dev
am: e8abff06f4

Change-Id: I01894c83b5081d88e5f12f2345332ddc792470f8