Merge "Revert "Update supplicant service to use V2 of the supplicant AI...""