[minor] #24865 Addressed code review feedback