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

Change-Id: I9dfa037c9e0ca7bb6fa6e2d9a79f71b9d500c139