Merge "Test services with no feedback type are included in enabled info list." into tm-dev