Merge "Fix flaky testNotifyNetwork_WithforceReevaluation test"