Merge "SF TimeStats: change the container of TimeRecord" into pi-dev am: 47fe4cac87
am: 2e73d5b6ca

Change-Id: Ie267925bab9ba5dc1e056bfbd058af6a5fba07bc