am c4102d66: (-s ours) Merge "DO NOT MERGE: Optimize IndirectRefTable." into ics-mr1

* commit 'c4102d6647043591bd89bba75454cc04d23753bd':
  DO NOT MERGE: Optimize IndirectRefTable.