Merge "Revert^2 "Remove minor version from sepolicy version"" into main