Merge "Add IntRange and FloatRange annotations"
am: 94a9377222

Change-Id: Iab472ad2c0ffe875069ea7b71ce10a14e9ef70f5