Merge "Fix a bug in combination of intrinsics and kNoOutputOverlap."