am 216d18b9: Merge "Remove IV auto-generation workaround."

* commit '216d18b997eb929c2c3af9b2102595f4ec694c20':
  Remove IV auto-generation workaround.