Issue #3460590 by porchlight: AddressFieldBuilder::build is not compatible with diff 2.0.x's CoreFieldBuilder::build