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

Change-Id: Id322e28c1f5405f292dc14e8a9eb4a51a9d930e6