Merge "Fix a couple of api-check complaints."