Ruben authored Jul 27, 2021 and Ruben committed Jul 30, 2021

Co-authored-by: Jagadeesh Ujja   <jagadeesh.ujja@arm.com>
Co-authored-by: Ruben Ayrapetyan <ruben.ayrapetyan@arm.com>

Change-Id: I8a141e357816e374065b9fa4c42b10b0d49604bd