Issue-Id: SCM-4386
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: I281aa63f552e71a636bc6b7f3c1adbb101099b01