Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev