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