Fix compilation errors from "service update"
Fix compiler errors due to #8031 -- REVERT THIS COMMIT LATER.