R=johnmccutchan@google.com Review URL: https://codereview.chromium.org/2378223002 .
BUG= R=zra@google.com Review URL: https://codereview.chromium.org/2101243005 .