Convert empty string to null Enum value, only throw ConversionExceptions (#14756)

Change-Id: I027a245975db12e3661740bd233edd98e73994e9