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

Change-Id: I6353003144e4c2cf5882d20d2d37921dc69b4bcf