bfc916e7b0
Signed-off-by: Erik Krogen <xkrogen@apache.org> Co-authored-by: Chengbing Liu <liuchengbing@qiyi.com> (cherry picked from commit ca3526da9283500643479e784a779fb7898b6627)