Revive FindBugs checks.
Merge remote-tracking branch 'gh/trunk' into g2