More Kitkat updates

Change-Id: I377f1c718422060fb6dcf218186682ba0c115d0f
Extra: add update script replacement

Change-Id: I202ad1a97b00cf3d55ad79711b925215def4def0