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

Change-Id: I374e9fd4e596efefd6742b9cd7a537a0e506ddac