Merge "Update references to removed APIs"