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

Upstreamed by Commit: 57280728e277c66d7803592cf071d87a21654d09