Merge "SF TimeStats: change the container of TimeRecord" into pi-dev