Cherry-pick
quick edit to servo support update