[NFC] fix more type conversion issues

GitOrigin-RevId: ed864f0a09d1fc7eae96faa4eb35b33880e6c478
Change-Id: I0338baedfe25ee66b4b8ef73bc9d1285a3d05874
1 file changed