Merge "Use public exposed interface of CPS service instead of spi"