Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a
am: 756216fdf9

Change-Id: I5cdfbac3dafeecde732ea641cfcfee34c5e376ed