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

Change-Id: I16487fc143e9edd2dc1cd57dd9e07cd8f7329232