Inline and remove redundant method

And remove TODO.

Bug: 205124386
Test: Presubmit (should be trivially correct).
Change-Id: I9a445f5a6dca4cbaa41b11464c1c0e2d068f95ec
1 file changed