am cb077f75: Merge "Resolve an old TODO." into lmp-dev

* commit 'cb077f75ac750d50c305ac5da20d81df5003907a':
  Resolve an old TODO.