Auditors: @bbondy

Test Plan:
Check that automated tests pass.