BUG=691882 TBR=brettw Review-Url: https://codereview.chromium.org/2691203002 Cr-Commit-Position: refs/heads/master@{#450229}
