Merge "Remove deprecated (and now unused) API method." into lmp-dev