r2.11 cherry-pick: da66bc6d5ff "Check for unexpected scalars in the shape argument to ParallelConcat."
Refer to the original commit: https://github.com/tensorflow/tensorflow/commit/da66bc6d5ff466aee084f9e7397980a24890cd15