Merge "cts: fix p2p cts test cases" am: dfb6f983bf am: f9b6c17b3b am: ad82db1993

Change-Id: I661e94f242cc350d418a08dfb2060c4ab834f480