Moves several TODO(klp) to TODO

Bug: 10605959
Change-Id: Ib7fec83a4bc59b1bd0b200af9ab63a298dd2b211
3 files changed