Merge changes I6d3584f3,Ifdaada39

* changes:
  Fix SntpClient 2036 issue (2/2)
  Fix SntpClient 2036 issue (1/2)