Merge "Fix issue with previous CL to use 64-bit sample times"