Sync prima with caf

Still no version bump

Change-Id: I80f882bd30d9b157f588e8009bf1eeb5e7741276
Merge branch 'cm-11.0' into kk_mkt