Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad am: ad299d38ff am: 1c92763087
am: 1f5d3014c5

Change-Id: I1f874e790b35686968f6c54f668db0cd996b6f70