Kits: Simplify handling of sticky kit information

Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>