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

Change-Id: Icd15990fab66d98ad65a4c870f7163daf3cc2137