Merge "Remove extraneous text from header comments." into main