Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.42' into cm-11.0

Change-Id: I1d387590a214d1cf1f99693f7a0ea1cb01c56932