Merge "Exclude unused operands from removeOperandTest"