Merge remote-tracking branch 'slim/kk4.4-caf' into ose