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

* commit '7737c9d712b37a3616267ac28848f8f3d74b29d6':