Merge "Add tests for Japanese eras formatting"