Issue-Id: SCM-4394
Signed-off-by: Richard Neill <richard.neill@arm.com>
Change-Id: Icc140af9cca0cf91ecfc700ed1b54b4ace5128db