Merge "Sonar Blocker fixes in FeedReport.java"