Signed-off-by: jikai <jikai11@huawei.com> (cherry picked from commit 24bec3c29babce28ea1a85f571ecdd97a6ffc1b0) (cherry picked from commit 0a4195bbb489cc31b78b3c5211e314dd10ac3227)
Signed-off-by: zhongtao <zhongtao17@huawei.com> (cherry picked from commit 8e60786a9fa82786c1d59abc85822ea46edc4d7d) (cherry picked from commit ee6ea4bdd725793d5f8c6293c139600ad8027c9e)