Merge "Manual overwrite @removed for genereated builder apis." into sc-dev