encore: update to kk4.4

Change-Id: I1587ccc40d046a9ffee060848e774ff82905360b
Merge "encore: update to kk4.4" into kk4.4