Merge remote-tracking branch 'caf/kk_2.7_rb1.37' into qcom-4.4_2.7

Change-Id: I4c4de86eda2d4b8b496bd56ec84b38101c339728