am cdc457bb: Merge "Tracking change to add AEAD functionality"

* commit 'cdc457bbba0afae2f0bc1b1df7ba596da3a48676':
  Tracking change to add AEAD functionality