am 8fccbcfb: am 9bbaa156: (-s ours) am 45660662: Merge "Workaround unknown ERI indices." into gingerbread

* commit '8fccbcfb8ea2e13727367b46ea4bb562f69d0bca':
  Workaround unknown ERI indices.