Merge "Add IntDef annotations to fields"