TBR=santa

Change-Id: I3841ddfd3de67dfe7f18d4f0d36c68d8b83da651
Reviewed-on: https://chromium-review.googlesource.com/1042574Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52966}