Merge "Fix DateUtils.formatElapsedTime."