R=machenbach@chromium.org

Change-Id: I59a373d838678ec8659a3014e5e3184e5c2d5c12
Reviewed-on: https://chromium-review.googlesource.com/1209462Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55684}