Merge "Update NTP outside locks, log large trim events." into ics-mr1