Merge "Limit too large scale_change exponent used in adjustTimeSlot"
am: cfc6616048

Change-Id: I4351d5a90fe317a803cd91da378b5d5584d46bc8