Sync some KitKat changes with CAF