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

Change-Id: I9834f0e2687685a52970ab406a411217cc2eeec9