Merge "Fix up API definitions in master."