am e24580a1: Merge "Rewrite BitVector index iterator."

* commit 'e24580a135aa6e85cdc49426ec74d2ae1e326243':
  Rewrite BitVector index iterator.