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

* commit '22b5d9b969176a196b0b29ce9441ac3d1d35d208':
  Remove IV auto-generation workaround.