[automerger skipped] Cleanup some obsolete TODOs and unused code. am: cda1a17516 am: 01178b4f9d
am: 38467d7eef -s ours
am skip reason: change_id I67610d3467d737cbfc085f00ea0b509b63f4612b with SHA1 d006f75672 is in history

Change-Id: Idb4e2d707afa8cad184f035e223be6398d450ef2