R=asiva@google.com Review-Url: https://codereview.chromium.org/2974233002 .
R=johnmccutchan@google.com Review URL: https://codereview.chromium.org/2470663006 .