Merge "Delete some more @removed APIs."