Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec am: ca6a0f99 am: 6b39d37d Change-Id: I81414dbbb0552963d0b4e0f1e2bfbb5ac680189f