Merge remote-tracking branch 'upstream/kk-4.4.3-caf' into kk-4.4.3-caf