[SPARK-2678][Core] Backport PR #1801 to branch-1.0#1831

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

liancheng:spark-2678-for-1.0liancheng/spark:spark-2678-for-1.0Copy head branch name to clipboard