Misc cleanup.

Random small stuff I came across while working on push validation.

Bug: 554220
Change-Id: I58d43860b2f347b5df2833868ad8f906513e8f40
Reviewed-on: https://chromium-review.googlesource.com/728361
Reviewed-by: Helen Li <xunjieli@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#510253}
3 files changed