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

Upstreamed by the commit-d : 891aed7c4fee9c831812fb2d6fc2aeeac6661884