Merge "Removal of text/util spi classes and references"