am 66b570c7: am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1

* commit '66b570c70471976cd2a99825898c778a7850f2c8':
  Update NTP outside locks, log large trim events.