Merge "Discover primary service by UUID for PTS tests (2/4)" am: cd35fa4509 am: 2a183763c7
am: ddd71ffa6e

Change-Id: I8643a5b47a3a89bf64984aa600ca51db4d66843d