Merge "Fix condition in mutateOperationOperandTypeSkip for conv ops."