Merge "API Review: Clean up removed APIs" into lmp-dev