Merge "Address leftover TODOs from inline suggestions." into rvc-dev am: 13d7838088

Change-Id: Ib6760313bb98d4bf1e1070a46bf956358d2c8219