Merge "Remove fixed todo" into rvc-dev am: bfcc5b3474 am: 54c542f5da

Change-Id: I13e212795c9085c34752efd02ec12d64ba49c76e