am c88047bf: Merge "Move NTP updates outside locks"

* commit 'c88047bf86fd83e5b0204d26b35776cad97ed877':
  Move NTP updates outside locks