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

* commit '47cda91f06d7e1ebce97986a8f90520fb670fec0':
  Fix AlphabeticIndexTest build failure.