Merge "Fixup SntpClient to bypass Private DNS" into pi-dev
am: 18474fcfaf

Change-Id: I4655e3ce5691098c73bf070b8a9e4759485bb17a