[SPARK-19529][BRANCH-1.6] Backport PR #16866 to branch-1.6#16917

liancheng wants to merge 1 commit intoapache:branch-1.6apache/spark:branch-1.6from

liancheng:spark-19529-1.6-backportliancheng/spark:spark-19529-1.6-backportCopy head branch name to clipboard