## What changes were proposed in this pull request?

cherrypick or manually porting changes to 2.1

## How was this patch tested?

Jenkins

Author: Felix Cheung <felixcheung_m@hotmail.com>
Author: hyukjinkwon <gurwls223@gmail.com>
Author: Wayne Zhang <actuaryzhang@uber.com>

Closes #19165 from felixcheung/rbackportpkg21.