fix activity package
Merge branch 'kktest' into kk4.4