Merge "Add IntDef annotation to gravity field"