Merge "Revert "[AWARE] Disable NANv3 data-path capabilities""