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

Change-Id: Ib1d2eedc4bc48bbd918813f20f6d37470bc7cdc7