Remove index field from FieldDefinition

Change-Id: I5d565291e5a85ba75de862ffe1866ee73f2ec760