The goal is to remove the function completely.

Bug: 8636060
Change-Id: I50b8f0368c8f6506209398ff931881e2235c3d2d