Reviewed-by: G Edhaya Chandran<edhaya.chandran@arm.com>

Upstreamed by Commit: fd5996f2d060a090c0d4bb0107a8790221539eb9