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

Change-Id: Ia7c231440233dae4bb491784d42020aed32bcdec