Merge "Enhance p2p state machine log" into udc-dev