Merge "Fix FindBugs violations"