R=machenbach@chromium.org

Bug: chromium:616879
Change-Id: Ice9927dd4bbaf72141c6693e4afaf57a362f515b
Reviewed-on: https://chromium-review.googlesource.com/884281Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Sergiy Byelozyorov <sergiyb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50852}