Merge "Remove redundant return @IntDef values"