Merge "Fix test expectations for NetworkCallbacks" into pi-dev