[Bug 427854] Improve kernel update (keep some non-exist entries and keep some order)