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

Change-Id: If2aefca53e02d14f5ffbd3748ee275ce9cfe8bac