Merge "cts: fix p2p cts test cases"