Issue-Id: SCM-3318
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Change-Id: I8151300dcd6ecd26211b6ed41fe5cf07938b9757