Merge "[Aware] Add pubSubId in the data-path request" into udc-dev