Merge "Address API review comments" into lmp-dev