Merge "Add missing CAPIF APIs to code generation"