Merge "Fix a p2p log issue of showing incorrect state name" into udc-dev