Merge "CSD: expose TestApi methods to test the feature"