Merge "Tracking change to add AEAD functionality"