base: QCOM's revenge

Based on Based on CAF kk_2.7_rb1.9

Change-Id: I3af645c662d2093ceb7df160484d2f0de9a33146