Merge prima driver kk_3.5_rb1.10

Signed-off-by: Willi Ye <williye97@gmail.com>