Ensure enum fields are created when not specifying a strict type (#10975)

Change-Id: I64cfc5b315444d7135738a8f3870bf50050f4678
Merge remote-tracking branch 'origin/master' into 7.4