Merge "Clean up TODOs am: 8fd2a85b6d am: c5b845cc0f" into rvc-d1-dev-plus-aosp