Merge "Implement API review feedback." into lmp-dev