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