Merge "Remove unused API defaults" into mainline-prod