Merge "Exclude AutoRevokeTest from GSI"