SF: fix conversion issues

Test: presubmit
Bug: 129481165
Change-Id: Ia3e2dfa38ad6b113c9b0ec5c50ce64225cd2898b
1 file changed