Merge "API Review cleanups."