Use constants in FieldDefinition constructor

Change-Id: I004c7bd0f524aa7b87ff82d80e98fd19e630b537
Merge "Use constants in FieldDefinition constructor"