Fix FindBugs
Merge remote-tracking branch 'build/multi-project'

Conflicts:
	build.gradle