Merge remote-tracking branch 'caf/kk_2.7_rb1.41' into HEAD

Change-Id: Ifd42eeb87830fbb826d4df7110338f40aa6f3c10