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

Change-Id: Ia543419909e3fac09df6c08bcdb9f28acf79678d