More KitKat merges
cleanup