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