And fix up NTP tests.

BUG=803095

Change-Id: I0b757c79ba6f0fe1b8a06cd7d4eaa700297b30ed
Reviewed-on: https://chromium-review.googlesource.com/949090Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541899}