Fix cherry-pick merge
Fix cherry-pick merge

jasonmalinowski/roslyn,jasonmalinowski/roslyn,shyamnamboodiripad/roslyn,dotnet/roslyn,CyrusNajmabadi/roslyn,dotnet/roslyn,bartdesmet/roslyn,mavasani/roslyn,dotnet/roslyn,shyamnamboodiripad/roslyn,bartdesmet/roslyn,mavasani/roslyn,mavasani/roslyn,CyrusNajmabadi/roslyn,CyrusNajmabadi/roslyn,jasonmalinowski/roslyn,shyamnamboodiripad/roslyn,bartdesmet/roslyn