Merge "Pass correct is_static to ResolveField."