Merge "Add NtpTimeHelper" into pi-dev