Merge "Follow up API signature change" into lmp-dev