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

* commit 'c3fac52dd51ba70db83d96b2d421bd440683d9bc':