Merge "Remove obsolete TODOs"
am: 6154285e36

Change-Id: I562e4453417dfee1f15f982c55c1f94b972aacea