Merge "Remove redefinition of uapi constant added in R." into main