[misc] fix merge of AuthenticationController GitOrigin-RevId: 7945a6e3b6f0c5e816db2a02745dc75a30928392