staging: Prima: Merge 'codeaurora/caf/kk_2.7_rb1.43' into cm-11.0

Change-Id: I22a36da165e4fc59d4efee3bd96eb948083c954c