TFS ID: 1635616, GitHub SHA: https://github.com/dotnet/corefx/tree/42a93b8d21fa5afc03f637aa961aa7b3d066cb1f
