Merge "Revert "Remove values-v24 folder for now"" into nyc-dev