Merge "Remove duplicate resource definitions"