Merge "Findbugs cleanup in sdkmanager projects"