Fix 'kk_2.7_rb1.43' mismerge

Change-Id: I60a741edfab919845f6f3b9947632148f9fcb4b6
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0