Merge "Remove references to deprecated NetworkBadging class."