Merge "enable strict_updatability_linting"