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

Change-Id: I603a444243fcdcf61850e17cb65a7008ea024cdb