Merge "Add options for p2p shell command "connect"" into udc-mainline-prod