Merge "Follow up CL to move back auto revoke code"