Merge commit '1cd77e0b1679101cef3b83857eea5c292c494a80' into display.lnx.9.0.r1-rel

Change-Id: I309507427c04eb43eeb9747d333094d464ae8533