Sync prima with kk_2.7-stable

Change-Id: Ic3595adcbd31243b4abbc96a8fa8f3f5162d50b2
Fixup a merge

Change-Id: I04dfd09c1878d98f11efa135fe1f1d991b60ab23