Merge remote-tracking branch 'origin/release/1.8.x' into origin/master

Change-Id: I3b28ecaf4c791eb4098fcfc673cbea9807d8d0c9
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
2 files changed