Merge "Check P2P channel before requesting network info" into udc-qpr-dev