Merge "Do not remove type string for old builds" into main