Merge "Remove strict_updatability_linting: true" into main