R=kmillikin@google.com BUG= Review-Url: https://codereview.chromium.org/2850783002 .
BUG= R=zra@google.com Review URL: https://codereview.chromium.org/2101243005 .