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

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