Merge "Fix duplicate dependency warnings"