Merge "[DPP] Fix usage of "DPP" public API to "Easy Connect""