Merge "Add option for duplicate classes check to return all dupes."
am: 66e226ac2f

Change-Id: I4dc43d68856b0e72e04178005f917a8463dd313a