Merge pull request #17006 from mattwire/l10nallowoverrideinherit