R=adamk@chromium.org, marja@chromium.org
BUG=

Review-Url: https://chromiumcodereview.appspot.com/2436073002
Cr-Commit-Position: refs/heads/master@{#40482}