This was fixed in later versions via 6d0eba93, but it's too large of a commit (and part of a series) to backport. Fix IPv4 bindings separately here. Change-Id: I632971c3a7f2aa65709c5ebb58ef02cf0a45e05a
6d0eba93