[MECHOPS] Code gen fix for ServiceService issue