BUG=chromium:625793
NOTRY=true
TBR=vogelheim@chromium.org, zhengxing.li@intel.com

Review-Url: https://codereview.chromium.org/2124763002
Cr-Commit-Position: refs/heads/master@{#37525}