Merge "[AWARE] CTS tests for publish/subscribe discovery"
am: 32e2012c2a

Change-Id: Ib7856de088d229ee6346bd94c279000ce041cb74