Changed TODOs to NOTEs

Change-Id: I17a0f5099bd6931c50189794596c742f6ddc5b5a
2 files changed