Merge pull request #717 from shi510:fix_build_err

PiperOrigin-RevId: 316357949