Merge r15175 from i18n_2 branch.