Merge "Support for API cleanups."