Merging fix from Spark team.
Merged.