Merge pull request #15852 from mfb/api-type-declaration