Merge "Fix AlphabeticIndexTest build failure."