Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> Co-authored-by: Nikhil Navadia <nikhil.navadiya@cloudera.com> (cherry picked from commit 7c00756aff6bf8d5e1d05748ba32b679e397b53f) (cherry picked from commit 4ea3b04bf36af56612c6b47d9ff8aa49cbbbcc9e) (cherry picked from commit 76faa41f18f1cb20a6469f53b475f52b662f8107)