Merge "[Ravenwood] Remove usage of RavenwoodFlagsValueProvider" into main