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

Change-Id: Ib6359785b2ddab4af83e90d194c85e8c00eadb61