Merge "cleanup for strict_updatability_linting"