Squash Commits

squash commits from the following:
prima/kk_2.7_rb1.24
caf/kk_2.7_rb1.24
v3.4.78

Change-Id: I596c7a09a182cd0601d6158135cba1f04128e9a3