updating the TODO's so our team can start work on these areas

Change-Id: I8c6293eac6f073a53435424cd146d7f6e6082943