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

Change-Id: I31311603d962c458755d95e882a916316a55848a