R=johnniwinther@google.com Review-Url: https://codereview.chromium.org/2941493002 .
R=karlklose@google.com Review-Url: https://codereview.chromium.org/2624373003 .