Merge "Fix multipathPolicyTracker query-update loop"