[NFC] fix more type conversion issues

GitOrigin-RevId: ed864f0a09d1fc7eae96faa4eb35b33880e6c478
1 file changed