Merge "Add option for duplicate classes check to return all dupes." am: 66e226ac2f am: dcfcc7afb8 am: 0ceb62c0ee
am: 21c5ee57a8

Change-Id: I8c83741ed352a1740594b83d5427de919a0e0cca