Merge "Deprecate a bunch of APIs."