Merge "[AWARE] Data-path negotiation update" am: a4b9cad4a1
am: b4c9402e6b

Change-Id: Ib6c1ef62a2819a76095989217f5d8d6bb091bb4b