Merge "Use a separate thread for services that do NTP lookup" into klp-dev