Signed-off-by: zhupuxu <zhupuxu@huawei.com>

Merge pull request !1866 from liudingyan/master

From: @zhupuxu
Reviewed-by: 
Signed-off-by:

Signed-off-by: zhupuxu <zhupuxu@huawei.com>

From: @zhupuxu
Reviewed-by: @ji_chen,@wqtshg
Signed-off-by: @wqtshg

Signed-off-by: zhupuxu <zhupuxu@huawei.com>

From: @zhao_zhixuan
Reviewed-by: 
Signed-off-by:

From: @dimitri_rose
Reviewed-by: @ji_chen,@wangxiaotian22
Signed-off-by: @ji_chen

From: @xuepenginnanjing
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen

From: @zhengyuanhua
Reviewed-by: 
Signed-off-by:

From: @chen-hua-baker
Reviewed-by: 
Signed-off-by:

From: @zhangxiaokun9
Reviewed-by: @xchu42
Signed-off-by:

From: @zhou_lili
Reviewed-by: @sheng-nan
Signed-off-by:

Merge pull request !1401 from 王笑天/master

From: @zhao_zhixuan
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen