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