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

* commit '1f74ba178bf28aca704578f381a93476560d49de':
  Resolve an old TODO.