Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec...
Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec am: ca6a0f99 am: 6b39d37d am: 3c4a4a4b am: 4d0f93b7
Change-Id: Ifd7eacd036405016177569d0c0eb11083ad4775e