Merge "API review cleanups."