Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev