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

Change-Id: Ica7e7c5e604c3081cfc89a2d1ce7780c3eddf8a1