Merge commit 'dd3afffa70b8c2940586db0679091b4ba3666ca9' into display.lnx.9.0.r1-rel

Change-Id: I7003e7757f1e8b6c99a93d97b0abd62c1405c5b1