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

Change-Id: I11b183d8212c01670ee38dc3b2283bee4c2a954e