Merge branch 'LA.HB.1.3.9_1' into display.lnx.3.0-dev

Change-Id: I72aff6fecdf580de749f1fb6f91d346dc0f91448
CRs-Fixed: 1058446