Merge "p2p: revise tethering handler for shared group interface support"