Missing file commit from r52226