Merge "Call method while holding lock." into lmp-dev