Simplify FieldDefinition constructor

Change-Id: I069ec4accfcf84974c1b4c82f0daa1aaa31fdad6
Merge "Simplify FieldDefinition constructor"