#19735523233460: Removing the the ContentBuilder from ContentResourceAssembler and use the external one