Merge "Add IntRange and FloatRange annotations"