Merge "Revert "Revert "Turn off duplicate-classes checking""" into mnc-dev