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