Merge "Make NtpTrustedTime safer / expand docs"
am: 49c903a0d2

Change-Id: Ic7f5229626383d2f9d25aead72966c617684f346