Merge remote-tracking branch 'caf/LNX.LA.2.7.4' into kk4.4

Change-Id: Id73aa5dbeec030cde68ec4cf4a37dff7ab886f90