prima: import from kk_2.7_rb1.31 (3.2.7.46)

Change-Id: Idf60cac15ecd8bd9593c0b2bf09c55a3d68afa76