Fixing merge between Gson and ReflectionProvider code

Because both pull request conflicts