Merge "Use elapsed realtime instead of times based on wall clock, which can jump around and go backwards."