Merge "Allow injecting cached NTP time without network" into tm-dev