am 94b1bae4: Merge commit \'a6e22fc9\' into manualmerge

* commit '94b1bae43287c5c8e2d31d05d4f68441acf667ab':
  Avoid computing class def indices.