Merge "Discover primary service by UUID for PTS tests (4/4)" into oc-dev
am: 9e6ef496bc

Change-Id: I689e8290c1d6572dc3fcb43e9fd320145fc08d0e