Merge changes Ieb0a5d24,I44df6668

* changes:
  Fix SntpClientTest failures with no active network
  Allow specifying a network for SNTP time sync