+ Created bugs for those TODOs that are still relevant. + Remove obsolete TODOs. Test: no code change. Change-Id: I41c2a89a882f087817ee6cbc3f095e1d80e1928e