Merge "Rooted out the last of the ReflectionToStringBuilder usage"