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

* commit 'fc387d7ef993bbcaf236a1ed65717432cfd8b0ec':