TODO updates

Change-Id: I593c3b2afe276f15e79ebb9f1d5aa8894aa48e8d
Merge "TODO updates"