Reviewed-by: mikael, erikj
Co-authored-by: Shoubing Ma <mashoubing1@huawei.com> Reviewed-by: sjohanss, ayang