Merge "Clean up SHORT_SERVICE time change code."