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

Change-Id: Ia0e33002b0d2b4a7e357555c15d6c285a38a2c8f