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