tree 5bf617faed9ee298f280f32351785b087c9a5034
parent feecbbbb930d8ae180ead14807f9293fa0389a08
author Xiaofei Bai <xiaofei.bai@arm.com> 1637830290 +0000
committer Xiaofei Bai <xiaofei.bai@arm.com> 1637914166 +0000

Rebase and add fixes

Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>