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