Merge "Remove references to AEAD in non-AEAD interface codepath"