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

* commit '28a9089f5b79e20ca5b023830255cf438a9cded7':
  Remove IV auto-generation workaround.