Merge "FeedService-Fixed String Comparison"