Merge "Fix bug in NetworkTimeUpdateService"