Bug: chromium:645890
TBR=yangguo@chromium.org
NOTRY=true

Change-Id: I83bf77a82317c3394d1b81133e52a8b6ecfbe360
Reviewed-on: https://chromium-review.googlesource.com/459418Reviewed-by: Daniel Vogelheim <vogelheim@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#44094}