Merge "Change the logic of getting ntp server"