Merge "Add a test for a ja_JP AlphabeticIndex bug."