Merge "Discover primary service by UUID for PTS tests (3/4)" am: 77bb5f0924
am: 543193e1bd

Change-Id: I805dec77e1d6474fe3876a3092131dab763e3796