And deploy it in a few places. R=ianh@google.com Review URL: https://codereview.chromium.org/1164303002
