Merge "Multiattach: Fix implicit requirement for encryption support"