Co-authored-by: S O'Donnell <sodonnell@cloudera.com> (cherry picked from commit 297f0f6d6a48468b56fd45c86412569cd927f749)