Merge "Make NtpTrustedTime safer / expand docs"