Merge "Fix several bugs on timer recoder code." into lmp-dev