Merge "Make StrictJavaPackagesTest log dupes"