Merge "Update AutoRevokeTest to handle multiuser properly" into sc-dev