Removing some TODOs with proper system API

Change-Id: I0d0e667cd6af8a7b9dbf3d0fd417f009ae402519
3 files changed