Merge "Update to match now slice APIs"