R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/418143004