Merge "Make testRemoveUserByHandle_ThrowsException fail faster."