Merge pull request !31783 from jjfeing/clean_code_317
Signed-off-by: zhoufeng <zhoufeng54@huawei.com>