Closes-bug: #1733262 Change-Id: I2d0a3422ba6a077a309c1fe967a2a62ef5ce6a36 Signed-off-by: Kevin Zhao <kevin.zhao@arm.com>