am 551d67ed: Merge "Move initialization check higher for updateAAD"

* commit '551d67ed92233b0d5a3eeeeb2b35f15b7b91480b':
  Move initialization check higher for updateAAD