Fix

Signed-off-by: Javelin <javelinanddart@gmail.com>
Fix

Signed-off-by: Javelin <javelinanddart@gmail.com>
KitKat sync part 3

Signed-off-by: Javelin <javelinanddart@gmail.com>