Merge "Do not convert time to float" into tm-qpr-dev