prima: import from kk_2.7_rb1.33 (3.2.7.47)

Change-Id: Ifb8db36903960732bf2daa0c8a30de1a28771a01