Merge remote-tracking branch 'caf/kk_2.7-stable' into cm-11.0