Merge "Add the IntRange and IntDef annotations for initial text API" into sc-dev