Merge remote-tracking branch 'SlimRoms/kk4.4' into kk4.4

Change-Id: I9e2587366e75e5fa4340704a3beb4e3c046b8cf2
Merge remote-tracking branch 'github/kk4.4' into kk4.4

Change-Id: Ic3e67da82dd5e2a269e9416395e983b455a0db20