Merge "Update trampolines to be in sync with jsons" into main