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