Merge "Override for testing when clock is not set" into tm-qpr-dev