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

Change-Id: I99cdde15f3ea9dc4630ccd09a242f3a1148d33bb