Merge remote-tracking branch 'caf/kk_2.7_rb1.32' into msm8960t for OmniROM