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

Change-Id: I4d07ac8b0974d8a332686e7cb691fe1fd361c506