- FindBugs fixes
(cherry picked from commit 5818d64e08046f6b6bcd76322704ca659f56695c)