This reapplies commits 462251b80b7 and 9b67c99dc5b, which were reverted in 53d35c4e86b due to bot failures for the wrapper_function_utils_test.cpp unit test.
This reapplies commits 462251b80b7 and 9b67c99dc5b, which were reverted in 53d35c4e86b due to bot failures for the wrapper_function_utils_test.cpp unit test.