Merge "Fixes to lock task API from API review" into lmp-dev