am 45660662: Merge "Workaround unknown ERI indices." into gingerbread

* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4':
  Workaround unknown ERI indices.