Merge "Change constants from API review feedback" into lmp-dev