Align these files with kitkat branch, without lossing any legacy changes