Merge "Delete deprecated methods after dogfood transition." into sc-dev