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

Change-Id: I87c4af26604c39a8d93035ce3a1efd0571d7892f
msm8960: fix merge errors

Change-Id: I97c1355e9824ff0939e88fbfc21228fa99b3e4bd