Merge "Remove incorrect ColorInt annotations"