am 42e85a94: am 47cda91f: Merge "Fix AlphabeticIndexTest build failure."

* commit '42e85a94e0fe1685ffa9d58a54e49338b001cbb4':
  Fix AlphabeticIndexTest build failure.