Merge "Remove fixed todo" into rvc-dev am: bfcc5b3474 am: 2c6b4aa9b9

Change-Id: I425774db247c9abd14f46deeac126c8c224c7d4f