Merge "Expose EAP config API"