Merge remote-tracking branch 'gummy/kk4.4' into android-4.4

Change-Id: Iaad22226a90a05ebeefbc119dcc58632fd7159f4