This reverts commit 6e0044be.
*merge develop into speechx
Co-authored-by: N0x45f <wangzhen45@baidu.com>