[automerger] Cleaning up some obsolete TODOs and methods am: de0e588a07

Change-Id: Icc383cb72fb6c25ac1599136b023079c26091d3e