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

Change-Id: I44ca78b19be5aecc75e064bf62e268818781942b