Merge "Fix SntpClient 2036 issue (2/2)"