Cherry-pick one missing piece related to gdbus-codegen