Merge "Change NTP update failure to warning"