Issue-Id: SCM-3990
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
Change-Id: I71ad7dd90c22eb1f3208ff4cf570f7c932a15e5d