Fixes cleanup issues#3874

chingor13 merged 2 commits intogoogleapis:mastergoogleapis/google-cloud-java:masterfrom

pmakani:cleanup_fixpmakani/google-cloud-java:cleanup_fixCopy head branch name to clipboard