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

Change-Id: I4b93a5754dd57f8c0e1a32b3dea259f788b29e97