Merge "Add option for duplicate classes check to return all dupes." am: 66e226ac am: dcfcc7af am: 0ceb62c0 am: 21c5ee57 Change-Id: I8c83741ed352a1740594b83d5427de919a0e0cca