am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"

* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks