LT-14366, ensure value-type custom fields always have values

Change-Id: Ic1288d440b5ee99dd486e3a947df2201367fb2a9