In some cases we may not want to auto-generate the Key Check Values. Change-Id: I244b717b3e3aae6eb3ad512f9e23ff0b65958bb7