Merge to XF: Disintermediation.

(cherry picked from commit 012ada613a1462f109eb59790f8e5ee91aacdb7e)
Review URL: https://codereview.chromium.org/1199553002.

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1197893002.
15 files changed