Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator"