Merge "Use the correct time functions for tracking service startup"