Merge "Added todo work" into rvc-dev am: fa75bf5bc7

Change-Id: I55f2f647934d4bfb230e4939fc724441eb5c7c9e