Merge "@IntDef is switching from long to int values"